9f351962d6b16e5df8f45e43fd978bee85c5ee3b,src/org/archicontribs/database/DBImporter.java,DBImporter,importSourceConnections,#DBModel#,300

Before Change


					break;
				}
			}
			DBObject dbSource = new DBObject(_dbModel, DBPlugin.generateId(result.getString("source"), _dbModel.getModelId(), _dbModel.getVersion()));
			if ( dbSource.getEObject() == null )
				DBPlugin.popup(Level.Error,  "Cannot found source "+result.getString("source"));
			DBObject dbTarget = new DBObject(_dbModel, DBPlugin.generateId(result.getString("target"), _dbModel.getModelId(), _dbModel.getVersion()));
			if ( dbTarget.getEObject() == null )
				DBPlugin.popup(Level.Error,  "Cannot found target "+result.getString("target"));
			DBObject dbObject = new DBObject(_dbModel, IArchimateFactory.eINSTANCE.create((EClass)IArchimatePackage.eINSTANCE.getEClassifier(result.getString("class"))));
			++nbConnection;
			dbObject.setId(result.getString("id"), _dbModel.getModelId(),_dbModel.getVersion());
			DBPlugin.debug("importing DiagramModelArchimateConnection " + ((IIdentifier)dbObject.getEObject()).getId());
			dbObject.setDocumentation(result.getString("documentation"));
			dbObject.setFont(result.getString("font"));
			dbObject.setFontColor(result.getString("fontcolor"));

After Change


		result.close();
	}

	private void importSourceConnections(DBModel _dbModel) throws SQLException {
		DBObject dbParent = null;
		String oldParent = null;
		//TODO: create proxies and resolve them once at the end (because 1 second each new DBObject(model, id) as it does a full elements scan !!!

		ResultSet result = DBPlugin.select(db, "SELECT * FROM diagrammodelarchimateconnection WHERE model = ? AND version = ? ORDER BY parent, rank", _dbModel.getProjectId(), _dbModel.getVersion());
		while(result.next()) {
			if ( !result.getString("parent").equals(oldParent) ) {
				dbParent = _dbModel.searchDBObjectById(DBPlugin.generateId(result.getString("parent"), _dbModel.getProjectId(), _dbModel.getVersion()));
				if ( dbParent.getEObject() == null ) {
					DBPlugin.popup(Level.Error, "Cannot import connection ("+result.getString("id")+") as we do not know its parent ("+result.getString("parent")+")");
					break;
				}
			}
			DBObject dbSource = _dbModel.searchDBObjectById(DBPlugin.generateId(result.getString("source"), _dbModel.getProjectId(), _dbModel.getVersion()));
			if ( dbSource.getEObject() == null )
				DBPlugin.popup(Level.Error,  "Cannot found source "+result.getString("source"));
			DBObject dbTarget = _dbModel.searchDBObjectById(DBPlugin.generateId(result.getString("target"), _dbModel.getProjectId(), _dbModel.getVersion()));